pm24.git/include/uapi/linux/usb, branch v3.8-rc5

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-11-10T23:32:51Z

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

UAPI: (Scripted) Disintegrate include/linux/usb

2012-10-09T08:49:07Z

Signed-off-by: David Howells Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Michael Kerrisk Acked-by: Paul E. McKenney Acked-by: Dave Jones

UAPI: (Scripted) Set up UAPI Kbuild files

2012-10-02T17:01:35Z

Set up empty UAPI Kbuild files to be populated by the header splitter. Signed-off-by: David Howells Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner Acked-by: Paul E. McKenney Acked-by: Dave Jones