diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 19:35:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 19:35:42 -0700 |
commit | 7b58fc21847950db8fcc6a142288b042564ffb76 (patch) | |
tree | 54242ee402ecafee2e39f2631707e80a4c8e7e1d /fs/ocfs2/journal.c | |
parent | 4e8a2372f9255a1464ef488ed925455f53fbdaa1 (diff) | |
parent | 1ab52cf910bbbee92861227e6ed77c56b1dc233c (diff) |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c: driver for the Synopsys DesignWare I2C controller
Diffstat (limited to 'fs/ocfs2/journal.c')
0 files changed, 0 insertions, 0 deletions