diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:09:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 09:09:43 -0700 |
| commit | 713c0515a555952d53956196d47dec3a3ece860a (patch) | |
| tree | 52ef61f6dbb338ad64e24662da859265d0c87a4d /include/net/x25device.h | |
| parent | 8f40f672e6bb071812f61bfbd30efc3fc1263ad1 (diff) | |
| parent | c913f94d86d75492af6222d268c53df236194afb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
arch/parisc/kernel/perf_asm.S: build fix
parisc: remove -traditional from assembler flags
parisc: use conditional macro for 64-bit wide ops
parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
arch/parisc/kernel/unaligned.c: use time_* macros
parisc: remove redundant display of free swap space in show_mem()
drivers/parisc: replace remaining __FUNCTION__ occurrences
parisc: replace remaining __FUNCTION__ occurrences
parisc: new termios definitions
parisc: fix trivial section name warnings
Diffstat (limited to 'include/net/x25device.h')
0 files changed, 0 insertions, 0 deletions