diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:50:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-03 16:50:20 -0800 |
| commit | 3e1c4005134e3a090c64c1bc35f965043bb451f4 (patch) | |
| tree | aae42aa4706ac44091eb119776183f2c61f0aed0 /arch/arm/plat-omap/include/mach/board-h4.h | |
| parent | b987e8e5a986e77069c99fda5da6878751808fe9 (diff) | |
| parent | fd4ef231962ab44fd1004e87f9d7c6809f00cd64 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: add quota call to ocfs2_remove_btree_range()
ocfs2: Wakeup the downconvert thread after a successful cancel convert
ocfs2: Access the xattr bucket only before modifying it.
configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()
ocfs2: Fix possible deadlock in ocfs2_write_dquot()
ocfs2: Push out dropping of dentry lock to ocfs2_wq
Diffstat (limited to 'arch/arm/plat-omap/include/mach/board-h4.h')
0 files changed, 0 insertions, 0 deletions