Merge branch 'hysdn' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 22:02:45 +0000 (15:02 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 12 Oct 2007 22:02:45 +0000 (15:02 -0700)
commit71a380d668189778416d37cde5521575a45c5a17
tree2b0fef402c3102278772c675504ae6441810805e
parent408af0dab78ef4145203b849d6bfd3195f6e3ec9
parent60cc5147ae07b3b0f7592a611fa20169f7dd02cc
Merge branch 'hysdn' of /linux/kernel/git/jgarzik/misc-2.6

* 'hysdn' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  [ISDN] hysdn: convert to PCI hotplug API