diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:52:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 12:52:53 -0700 |
commit | c732acd96085347027b11961463a243c568d9aab (patch) | |
tree | 5ce568eb6a31a39dfa5c5af4e10e6270383a07a2 /fs/file.c | |
parent | 1b2d3d94ec878c3529153061cd8cceb876e01a3e (diff) | |
parent | 5cb02ff3489d710c73b4a21bb804feedeacce116 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
fdomain_cs: Sort out modules with duplicate description
pcmcia: Whine harder about use of EXCLUSIVE
pcmcia: IRQ_TYPE_EXCLUSIVE is long obsoleted
Diffstat (limited to 'fs/file.c')
0 files changed, 0 insertions, 0 deletions