From: Linus Torvalds Date: Fri, 14 Apr 2006 03:30:58 +0000 (-0700) Subject: Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 X-Git-Tag: v2.6.17-rc2~77 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e5e24bf64b755a034d8294303bc61d8f40ebeaf;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Make show_mem() skip holes in a pgdat [IA64] ia64_wait_for_slaves() incorrectly reports MCA --- 0e5e24bf64b755a034d8294303bc61d8f40ebeaf