aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 07:57:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-24 07:57:38 -0700
commit1b506cfb6ae63f352643d6e208c85c1351547036 (patch)
tree4556cbdb0443eadc4406778a45d7b771f0dc7be7 /drivers/net
parent4cc4d24efce4672f9b0e7fa27963770ae602998f (diff)
parenta49fb4c3d035ab516507b31ec3bd49263caee14d (diff)
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: deprecate the commands pending counter exofs: Write sbi->s_nextid as part of the Create command exofs: Add option to mount by osdname exofs: Override read-ahead to align on stripe_size exofs: simple fsync race fix exofs: Optimize read_4_write exofs: Trivial: fix some indentation and debug prints exofs: Remove redundant unlikely()
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions