]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'pm/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:39:25 +0000 (14:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:39:25 +0000 (14:39 +1100)
commit3570dd04134933e8eb6deb4b8baed3ffa97ba2cc
tree57ddaab313920c5c68988b4d002921f2825ee1a9
parent4f9ba7e83244fdfea9b066a9ed60dd64a695ebb3
parent086652c19b2d321ead9fc7216c70157efae16329
Merge remote-tracking branch 'pm/linux-next'

Conflicts:
fs/xfs/xfs_buf.c
16 files changed:
Documentation/feature-removal-schedule.txt
arch/arm/mach-s3c64xx/Kconfig
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/pm.c
arch/m68k/include/asm/thread_info.h
fs/btrfs/async-thread.c
fs/btrfs/disk-io.c
fs/ext4/super.c
fs/fs-writeback.c
fs/gfs2/log.c
fs/gfs2/quota.c
fs/nfs/nfs4proc.c
fs/xfs/xfs_buf.c
kernel/fork.c
mm/oom_kill.c
net/sunrpc/sched.c