aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/leds
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
committerJiri Kosina <jkosina@suse.cz>2010-02-25 17:39:16 +0100
commit14ef2b0c026558d37662e5e095d59c64597d5769 (patch)
tree230c09cc65bc94384c687fed87e6ada954f80609 /drivers/leds
parent57ab12e418ec4fe24c11788bb1bbdabb29d05679 (diff)
parent71b38bd4c1cc4f2b653064357e4efab77dfd711d (diff)
downloadkernel_samsung_espresso10-14ef2b0c026558d37662e5e095d59c64597d5769.zip
kernel_samsung_espresso10-14ef2b0c026558d37662e5e095d59c64597d5769.tar.gz
kernel_samsung_espresso10-14ef2b0c026558d37662e5e095d59c64597d5769.tar.bz2
Merge branches 'upstream', 'raw_report_modifications' and 'apple_magic_mouse' into for-linus
Conflicts: drivers/hid/Kconfig
Diffstat (limited to 'drivers/leds')
0 files changed, 0 insertions, 0 deletions