diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 01:41:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-06 01:41:07 -0800 |
| commit | c6f7afaeeda5b3c42ea8d7b27e197d223a04675e (patch) | |
| tree | 9a86bc9593ef8219bfc469e277d1b327f38aed9e /net/lapb/lapb_subr.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | exofs: simple_write_end does not mark_inode_dirty (diff) | |
| download | linux-dev-c6f7afaeeda5b3c42ea8d7b27e197d223a04675e.tar.xz linux-dev-c6f7afaeeda5b3c42ea8d7b27e197d223a04675e.zip | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
exofs: simple_write_end does not mark_inode_dirty
exofs: fix pnfs_osd re-definitions in pre-pnfs trees
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions