]> err.no Git - linux-2.6/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jun 2008 01:09:47 +0000 (18:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jun 2008 01:09:47 +0000 (18:09 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  [GFS2] fix gfs2 block allocation (cleaned up)
  [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000


Trivial merge