Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
[linux-2.6] / include / linux / aer.h
2006-09-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2006-09-27  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-09-27  Zhang, YanminPCI-Express AER implemetation: AER core and aerdriver