]> 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, 22 Aug 2011 02:36:59 +0000 (12:36 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 22 Aug 2011 02:36:59 +0000 (12:36 +1000)
commita919ad99290514827b77909abdb72048b43aaf62
treea066145f4839e18e32bbe18ed0b00261acf3a713
parenta6d4ee3b31e890aefa10a2346630718d9e277388
parent56f0befe8ae5453970b11e05097b6bc30134990b
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
arch/s390/include/asm/thread_info.h
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/setup-sh7372.c
arch/s390/include/asm/thread_info.h
drivers/bluetooth/btusb.c
drivers/net/ethernet/intel/e1000e/netdev.c
fs/ext4/super.c
fs/gfs2/quota.c
fs/xfs/xfs_buf.c
include/linux/netdevice.h
net/mac80211/main.c