]> 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, 13 Sep 2011 04:29:36 +0000 (14:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2011 04:29:36 +0000 (14:29 +1000)
commit8cfb335bae432e1c7ab12db383d04a461ecfbc00
tree9b63223241f6e4d32aff32b0413bb65213f841b3
parentf1424c248fe35a370b2b00c2bd1469472a29a98a
parent350732c2c19070cf646c12ef2e60c9a46968b703
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/arm/mach-shmobile/board-ap4evb.c
arch/s390/include/asm/thread_info.h
drivers/mfd/twl4030-irq.c
19 files changed:
arch/alpha/include/asm/thread_info.h
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/include/mach/sh7372.h
arch/arm/mach-shmobile/setup-sh7372.c
arch/s390/Kconfig
arch/s390/include/asm/thread_info.h
drivers/bluetooth/btusb.c
drivers/media/video/via-camera.c
drivers/mfd/twl6030-irq.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/usb/core/hcd.c
fs/ext4/super.c
fs/gfs2/log.c
fs/gfs2/quota.c
fs/xfs/xfs_buf.c
include/linux/netdevice.h
net/mac80211/main.c
net/mac80211/mlme.c