diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:43:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:43:04 -0800 |
| commit | f187a4514f54382ab017e8630d7d1f51732dabd8 (patch) | |
| tree | b81c80b8a45df06eae4293f20f39625f8d6ad1e6 /fs/ocfs2/slot_map.h | |
| parent | 70231669596fdd76dddfc2a4f53415d3dd84377e (diff) | |
| parent | 754961a8e1ef49ee2d304d2ab086cf0aa6809214 (diff) | |
Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung
* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: SAMSUNG: Fix HAVE_S3C_RTC warnings
ARM: SAMSUNG: Fix HAVE_S3C2410_I2C warnings
ARM: SAMSUNG: Fix HAVE_S3C2410_WATCHDOG warnings
Diffstat (limited to 'fs/ocfs2/slot_map.h')
0 files changed, 0 insertions, 0 deletions