]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 03:36:39 +0000 (14:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 14 Oct 2011 03:36:39 +0000 (14:36 +1100)
commit6b8c00809a7794db7b0d687feece8f01501e398a
tree1c822af830925303e4bfcaae2d0e1b6ec3e9faa6
parent616d2b463761e7b4c9133f20db1a09e576e5f607
parentd7aaecb10d724da6d6a095ca5a6bfee81bac6822
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
21 files changed:
Documentation/kernel-parameters.txt
Documentation/power/basic-pm-debugging.txt
MAINTAINERS
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/s390/Kconfig
drivers/bluetooth/btusb.c
drivers/hid/usbhid/hid-core.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/usb/usbnet.c
drivers/tty/Kconfig
include/linux/device.h
include/linux/netdevice.h
include/sound/pcm.h
kernel/Makefile
kernel/power/Kconfig
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/scan.c
sound/core/pcm_native.c
sound/usb/card.c