Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 22:46:57 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 22:46:57 +0000 (15:46 -0700)
commit671f837a04cbcaaa10e8404989cf08ca3fdf1c80
treed98a55d2e347ad15a73cbd860d1fd71a61be20bd
parentc9e2a72ff1acfdffdecb338b3d997f90c507e665
parentb1142e8fec6a594723e5054055a7b53379b90490
Merge branch 'for_linus' of git://git./linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  ext4: BUG_ON fix: check if page has buffers before calling page_buffers()