]> 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, 20 Sep 2011 04:31:56 +0000 (14:31 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Sep 2011 04:31:56 +0000 (14:31 +1000)
commit8d9157219f4725fe69cd3df463395eccd32e803e
tree62de1482fd0974b26aebb1549041b647ecc02da0
parent4173ec3675f7c251025391e4bb93f3faa3c88e9c
parenta5232e4d60e0100d2e2c5abba04054fc4a320e0c
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
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
net/mac80211/main.c
net/mac80211/mlme.c
sound/usb/card.c