| commit | 8fe5f56c8a203a7a83d1b621c369655d914f3752 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Apr 26 20:00:35 2012 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Thu Apr 26 20:00:35 2012 -0700 |
| tree | ec865efb2d577d1e536720a28ae18b10bdbfd973 | |
| parent | df2e7f525d88da992021b589d8a412afc15de36c [diff] | |
| parent | 82b769063598d01a8b24abf250a53f8b437e09f1 [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>