diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 21:17:29 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 21:17:29 +0200 |
commit | adadfe48df3858c3c1ba52963502f38885ab2f3c (patch) | |
tree | f6e6388f5dff08878c0888ab42122fbe81710783 /drivers/net/znet.c | |
parent | Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
parent | UBIFS: seek journal heads to the latest bud in replay (diff) | |
download | linux-adadfe48df3858c3c1ba52963502f38885ab2f3c.tar.xz linux-adadfe48df3858c3c1ba52963502f38885ab2f3c.zip |
Merge branch 'for-linus' of git://git.infradead.org/ubifs-2.6
* 'for-linus' of git://git.infradead.org/ubifs-2.6:
UBIFS: seek journal heads to the latest bud in replay
UBIFS: do not free write-buffers when in R/O mode
Diffstat (limited to 'drivers/net/znet.c')
0 files changed, 0 insertions, 0 deletions