Merge branch 'master'
[powerpc.git] / drivers / i2c / chips / x1205.c
2005-10-28 Jeff GarzikMerge branch 'master'
2005-10-28 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
2005-10-28 Alessandro Zummo[PATCH] i2c: New Xicor X1205 RTC driver