Merge by hand (conflicts in sd.c)
[linux-2.6] / sound / i2c / other /
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-15  Len BrownMerge ../to-linus-stable/
2005-08-04  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-30  Len Brownmerge 2.6.13-rc4 with ACPI's to-linus tree
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-07-29  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-29  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-29  Linus TorvaldsMerge head 'upstream' of /linux/kernel/git/jgarzik...
2005-07-28  Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2005-07-28  Jaroslav Kysela[ALSA] ak4114: removed duplicate wake_up()
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2