summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-01 17:28:26 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-01 17:28:26 +0200
commitc92758ceda477b1333fde35327cfa867dcc47bd1 (patch)
tree9bdb7e6a5a25b746f175c4ebfb9028ec91115bb6 /drivers/memstick
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff)
parentMerge branch 'smsc47b397-new-id' into release (diff)
downloadlinux-c92758ceda477b1333fde35327cfa867dcc47bd1.tar.xz
linux-c92758ceda477b1333fde35327cfa867dcc47bd1.zip
Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: hwmon: (adt7473) minor cleanup / refactoring hwmon: (asb100) Remove some dead code hwmon: (lm75) Fix an incorrect comment hwmon: (w83793) VID and VRM handling cleanups hwmon: (w83l785ts) Don't ask the user to report failures hwmon: (smsc47b397) add a new chip id (0x8c)
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions