diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 17:47:09 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 17:47:09 +0100 |
commit | a2f0bb03f7c499e3db72c70a62b1aa5c55d6a82b (patch) | |
tree | 761a00d15b20840e501f1825f1a48e1f21725cc5 /fs/ocfs2/ocfs2.h | |
parent | Merge tag 'trace-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/rost... (diff) | |
parent | avr32: update all default configurations (diff) | |
download | linux-a2f0bb03f7c499e3db72c70a62b1aa5c55d6a82b.tar.xz linux-a2f0bb03f7c499e3db72c70a62b1aa5c55d6a82b.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull AVR32 update from Hans-Christian Egtvedt.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
avr32: update all default configurations
avr32: remove fake at91 cpu identification
avr32: wire up missing syscalls
Diffstat (limited to 'fs/ocfs2/ocfs2.h')
0 files changed, 0 insertions, 0 deletions