diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-02 20:21:23 -0700 |
commit | 1398ab7cb92b21d8d5add3bdc25b2c00462cfd5c (patch) | |
tree | ecfe847dda816361d83b1da6d7213b27721e7fd7 /sound/pci/emu10k1 | |
parent | a166222cde740b34d97fe49dca70348197f4534e (diff) | |
parent | e252630f1fd1d14ac4081e566d2f697ae1779215 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3743/1: ARM: OMAP: Fix compile for OMAP
[ARM] 3739/1: genirq updates: irq_chip, add and use irq_chip.name
Diffstat (limited to 'sound/pci/emu10k1')
0 files changed, 0 insertions, 0 deletions