diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:01:02 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-18 15:01:02 -0500 |
| commit | 69098bac169d630a777b362470f20451b9446e39 (patch) | |
| tree | af916fdbdb51940ec6050628401d300c83d129a9 /include/asm-sparc64/ioctl.h | |
| parent | b3806c3b940540ba9386a334ff0cc2597a5af60e (diff) | |
| parent | 8983fdb50878ae6fa2ced336ef6072f8d5d502e3 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: favr-32 build fix
ATSTK1006: Fix boot from NAND flash
avr32: remove .note.gnu.build-id section when making vmlinux.bin
avr32: Enable pullup on USART TX lines
Diffstat (limited to 'include/asm-sparc64/ioctl.h')
0 files changed, 0 insertions, 0 deletions