diff options
| author | Linus Torvalds | 2013-09-30 10:40:20 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2013-09-30 10:40:20 -0700 |
| commit | 5c282e858f87651e97b31b99e7446aeb449f987e (patch) | |
| tree | d54d80f5e19989485c97ab16d898387d21d3e6f7 /fs/ocfs2 | |
| parent | 8945546d90a748d1484872c48823f8c8ab302577 (diff) | |
| parent | 395e73a278cfa3b1560b414ab93674711574ddc6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 fixes from Hans-Christian Egtvedt.
Fix build warnings and use the Kbuild infrastructure for generic headers
rather than doing it by hand.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: cast syscall_return to silence compiler warning
avr32: fix clockevents kernel warning
avr32: use Kbuild infrastructure to handle the asm-generic headers
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions