]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:36:14 +0000 (15:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:36:14 +0000 (15:36 +1000)
commit38ce4f0e618aeda7354a5937cea2ab0694fa3871
tree85b04d4402fc765c98cdfc9667af3afa338bac9b
parenta5019e027e42f51daad8aceb880b7ad7963c6da2
parent79bd4ec5ed8da90f51184d0c5ffd8f7c72307bb3
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
12 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/wireless/ipw2x00/ipw2100.c
include/linux/netdevice.h
include/sound/pcm.h
net/mac80211/main.c
net/mac80211/mlme.c
sound/usb/card.c