diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 14:48:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-26 14:48:53 -0800 |
| commit | bb385942967fb7e0ff8cb8fea7a32561ef609a1a (patch) | |
| tree | a30ecace0d1d7c3a6140817b0c2d47e73b38a9b6 /fs/ocfs2/ocfs2_fs.h | |
| parent | d312c8f81c9810d669cdf13b28f1a5d474738eaf (diff) | |
| parent | 4fe4f4ace5a667122f8dd04302e19e46d99e3594 (diff) | |
Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
[AVR32] Update ATSTK1000 defconfig: Enable macb by default
[AVR32] Export clear_page symbol
Diffstat (limited to 'fs/ocfs2/ocfs2_fs.h')
0 files changed, 0 insertions, 0 deletions