diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 10:00:50 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-18 10:00:50 -0800 |
commit | aa891f6b3f440402c6879ad1ecf332d318137422 (patch) | |
tree | 35b1997a00ecf137e22713de8a25ad011d07b6d9 /arch/mips | |
parent | Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
parent | parisc: fix compile breakage caused by inlining maybe_mkwrite (diff) | |
download | linux-dev-aa891f6b3f440402c6879ad1ecf332d318137422.tar.xz linux-dev-aa891f6b3f440402c6879ad1ecf332d318137422.zip |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
parisc: fix compile breakage caused by inlining maybe_mkwrite
parisc : Remove broken line wrapping handling pdc_iodc_print()
Diffstat (limited to 'arch/mips')
0 files changed, 0 insertions, 0 deletions