git.stricted.de - GitHub/exynos8895/android_kernel_samsung_universal8895.git/commit

projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: abfe0af d9244b5)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 1 Jun 2009 19:06:21 +0000 (21:06 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 1 Jun 2009 19:06:21 +0000 (21:06 +0200)
commit	3d58f48ba05caed9118bce62b3047f8683438835
tree	94c911034f0e14ded73d3e9e6e9f8e22b6cad822	tree \| snapshot (tar.gz zip)
parent	abfe0af9813153bae8c85d9bac966bafcb8ddab1	commit \| diff
parent	d9244b5d2fbfe9fa540024b410047af13ceec90f	commit \| diff

Merge branch 'linus' into irq/numa

Conflicts:
arch/mips/sibyte/bcm1480/irq.c
arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>