imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-08 02:19:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
427,804 Commits 5 Branches 1,034 Tags
2eb060975df2aaca635801dcfb99eaa45ede98fe
Commit Graph
2 Commits
Author SHA1 Message Date
David S. Miller d4185bbf62 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

Minor conflict between the BCM_CNIC define removal in net-next
and a bug fix added to net.  Based upon a conflict resolution
patch posted by Stephen Rothwell.

Signed-off-by: David S. Miller <[email protected]>
 2012-11-10 18:32:51 -05:00
David Howells 5e1ddb4817 UAPI: (Scripted) Disintegrate include/linux/usb 
Signed-off-by: David Howells <[email protected]>
Acked-by: Arnd Bergmann <[email protected]>
Acked-by: Thomas Gleixner <[email protected]>
Acked-by: Michael Kerrisk <[email protected]>
Acked-by: Paul E. McKenney <[email protected]>
Acked-by: Dave Jones <[email protected]>
 2012-10-09 09:49:07 +01:00