Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
commit08456d10a6bc208bafced4f7b4090abccfb594da
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:34:02 +0000 (30 08:34 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 30 Jan 2007 16:34:02 +0000 (30 08:34 -0800)
tree98988ac1081ef73779fdf5b8e100e8f88619e3b9
parent701dfbc1cbdd42b814dd76a885c4b73f97011d08
parent7d2aae1e88660cf09be913e9754e45189dc33412
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  [PATCH] ALSA: Fix sysfs breakage