]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:08:47 +0000 (14:08 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Sep 2011 04:08:47 +0000 (14:08 +1000)
commitd571d58d3d1007110a1985e69b7978571bcfe7d5
tree7708c5a7e1c3c833c098fc064f945fe3156763d5
parent800c9b746f39da586a84e88f3a1f8b69eed81619
parent4baa28640dfb6608e60e82e49ef6e56b78847729
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
13 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
include/linux/netdevice.h
include/sound/pcm.h
net/mac80211/main.c
net/mac80211/mlme.c
net/mac80211/scan.c
sound/core/pcm_native.c
sound/usb/card.c