]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:52:53 +0000 (12:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Oct 2008 19:52:53 +0000 (12:52 -0700)
commitc732acd96085347027b11961463a243c568d9aab
tree5ce568eb6a31a39dfa5c5af4e10e6270383a07a2
parent1b2d3d94ec878c3529153061cd8cceb876e01a3e
parent5cb02ff3489d710c73b4a21bb804feedeacce116
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