summaryrefslogtreecommitdiff
path: root/drivers/scsi/megaraid/megaraid_sas.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-11-01 04:03:23 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2010-11-01 04:03:23 +0300
commit50440c6dcccbf90ee3629407cb13ca09cab7d900 (patch)
tree6441432e78ec884863e5104ad4893e2a3dbe8059 /drivers/scsi/megaraid/megaraid_sas.c
parent09d692e6ff50e455f936e7e114e11f6ec5e0ea33 (diff)
parent55fee8d7f7cb011d7f161cf816220ac74e34b6b1 (diff)
downloadlinux-50440c6dcccbf90ee3629407cb13ca09cab7d900.tar.xz
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c-i801: Add PCI idents for Patsburg 'IDF' SMBus controllers i2c-i801: Handle multiple instances instead of keeping global state i2c-i801: Add Intel Patsburg device ID i2c: Drop unused I2C_CLASS_TV flags
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.c')
0 files changed, 0 insertions, 0 deletions