projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ceba1ab 722154e)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 7 May 2010 01:29:25 +0000 (11:29 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 7 May 2010 01:29:25 +0000 (11:29 +1000)
1  2 
arch/powerpc/mm/numa.c patch | diff1 | diff2 | blob | history
drivers/misc/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/mm/numa.c
Simple merge
diff --cc drivers/misc/Makefile
Simple merge
Motorola kernel-slsi