]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20ac943 ace1d81)
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 03:30:58 +0000 (20:30 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 14 Apr 2006 03:30:58 +0000 (20:30 -0700)
* '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


Trivial merge
Linux 2.6 source tree