]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:33:00 +0000 (15:33 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:33:00 +0000 (15:33 +1100)
commitcb9f15c2c394b0e5fbbe502653881b9fa32f022f
treefad8ca886bf709d29437ee4617d1d0ab1b3423ae
parent0ab168e7d2cf3c9708d3136de24e24c302ab98ab
parent786fae101c3f00ec419243d978a733414e576483
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
17 files changed:
Documentation/power/basic-pm-debugging.txt
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