diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 22:53:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-29 22:53:46 -0700 |
| commit | af652c26f5f0eceb6d8cb97eb9b86fba6f1f3b85 (patch) | |
| tree | 040910901d5349dfd6539901730181e930af2024 /net/atm/clip.c | |
| parent | b83a8e64fd1aecf021111d22c062c97a3241d0c4 (diff) | |
| parent | ceaccbd2a6a82b97bd15938fc7ffe180754cbe6c (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3734/1: Fix the unused variable warning in __iounmap()
[ARM] 3737/1: Export ARM copy/clear_user_page symbols
[ARM] 3736/1: xscale: don't mis-report 80219 as an iop32x
[ARM] 3733/2: S3C24XX: Remove old IDE registers in Anubis
[ARM] 3732/1: S3C24XX: tidy syntax in osiris and anubis machines
[ARM] Fix SMP booting
[ARM] 3731/1: Allow IRQ definitions of IQ80331 and IQ80332 to co-exist
[ARM] 3730/1: ep93xx: enable usb ohci driver in the defconfig
[ARM] Fix cats build
Diffstat (limited to 'net/atm/clip.c')
0 files changed, 0 insertions, 0 deletions