diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 21:33:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 21:33:07 -0800 |
| commit | 5b67e8dd5ae889fea7d01b905a570fa9a37b8785 (patch) | |
| tree | 6a84a2bbe73b44fb13fb125ea07250cb778f0082 /drivers/net/s2io.c | |
| parent | a8b59e79ed55de97949ff1ca7d933786b95b39bd (diff) | |
| parent | cc3d48db75235adf0ae37d3287f6f9e14657d1ae (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3424/2: ixp23xx: fix uncompress.h for recent CRLF decompressor change
[ARM] 3434/1: pxa i2s amsl define
[ARM] 3425/1: xsc3: need to include pgtable-hwdef.h
[ARM] Allow un-muxed syscalls to be available for everyone
[ARM] 3420/1: Missing clobber in example code
[ARM] nommu: fixups for the exception vectors
[ARM] nommu: add nommu specific Kconfig and MMUEXT variable in Makefile
[ARM] nommu: start-up code
[ARM] nommu: MPU support in boot/compressed/head.S
Diffstat (limited to 'drivers/net/s2io.c')
0 files changed, 0 insertions, 0 deletions