tree d733127661d643a936416025a46199895fbd18c0
parent 919c0d14ae93073a3957c018a6d86ceb1e2e454b
parent 5af4e7a0bea715f2dd7190859a43eb2258b1f388
author Linus Torvalds <torvalds@linux-foundation.org> 1214356187 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1214356187 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

* 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