]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'quilt/i2c'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:47:53 +0000 (11:47 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 3 Oct 2012 01:47:53 +0000 (11:47 +1000)
1  2 
drivers/i2c/busses/Kconfig
include/linux/pci_ids.h

Simple merge
Simple merge