summaryrefslogtreecommitdiff
path: root/drivers/block/drbd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 15:32:56 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-04 15:32:56 (GMT)
commit7dbb25a579fe1f068358a19928ada4f9be62e60d (patch)
tree29730185284cbe3ac6252847e15df35118958737 /drivers/block/drbd
parent4352d9d44b935e4d000be6ec89ddb55c2bf35f24 (diff)
parentc4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e (diff)
downloadlinux-fsl-qoriq-7dbb25a579fe1f068358a19928ada4f9be62e60d.tar.xz
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modalias
Diffstat (limited to 'drivers/block/drbd')
0 files changed, 0 insertions, 0 deletions