projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: df2e7f5 82b7690)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 Apr 2012 03:00:35 +0000 (20:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Apr 2012 03:00:35 +0000 (20:00 -0700)
commit8fe5f56c8a203a7a83d1b621c369655d914f3752
treeec865efb2d577d1e536720a28ae18b10bdbfd973tree | snapshot
parentdf2e7f525d88da992021b589d8a412afc15de36ccommit | diff
parent82b769063598d01a8b24abf250a53f8b437e09f1commit | diff
Merge git://git./linux/kernel/git/torvalds/linux

Conflicts:
arch/sparc/kernel/leon_smp.c

Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.

Resolve a small include line conflict in leon_smp.c

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/leon_smp.c diff1 | diff2 | blob | history
Domain: System / Kernel;