Merge branch 'master' into upstream
[linux-2.6] / sound / aoa / soundbus / i2sbus / i2sbus-pcm.c
2006-06-23  Jeff GarzikMerge branch 'master' into upstream
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/w1-2.6
2006-06-22  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-22  Johannes Berg[ALSA] snd-aoa: add snd-aoa