d15a73cbd860d1fd71a61be20bd
parent c9e2a72ff1acfdffdecb338b3d997f90c507e665
parent b1142e8fec6a594723e5054055a7b53379b90490
author Linus Torvalds <torvalds@linux-foundation.org> 1288306017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1288306017 -0700

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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()
�����,x