git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 585072d ca548ac)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 02:44:17 +0000 (13:44 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 30 Nov 2011 02:44:17 +0000 (13:44 +1100)
commit	448e2109842418b8ba4eb24a234caa102d60fc22
tree	b68015bce78e63fa73bf1f307bd7c13ff4da30fc	tree \| snapshot
parent	585072d3461177763ae187fcff5c84f0d9616ea1	commit \| diff
parent	ca548acf8501550dd0058c99d12601f9c9c49abd	commit \| diff

Merge remote-tracking branch 'pm/linux-next'

Conflicts:
kernel/cgroup_freezer.c

arch/m68k/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/rts_pstor/rtsx.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/log.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/quota.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup_freezer.c	diff1 \|	diff2 \|	blob \| history
kernel/cpu.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules