]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2567598 daf85d8)
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)
commitd2ffabcfefd3aea408679f43d10ed0ed0008769a
treeec865efb2d577d1e536720a28ae18b10bdbfd973tree | snapshot
parent2567598845527d94842fbf6ad086f83c9546baf0commit | diff
parentdaf85d87ba3f457256514528f53319c2662dd2f4commit | diff
Merge git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.