]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:02:15 +0000 (15:02 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 04:02:15 +0000 (15:02 +1100)
commit197e8d6a8ae883ceb59a90f371da0d26af354178
tree96fa88a1297bc283d27f645c43ba9dd4006ac83f
parent52ff8031fb83687e5ff9efc45ab10ca378339e2d
parent838b03770a6c86ef037c42a084826e43d514bd0b
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
19 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/net/ethernet/intel/e1000e/netdev.c
drivers/net/usb/usbnet.c
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