summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-omap2-mcspi.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-22 11:33:42 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-22 11:35:11 +0200
commit99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc (patch)
tree9dbe8427ee72d1aa2fce24a53df2723c3745e2be /drivers/spi/spi-omap2-mcspi.c
parentMerge branch 'upstream' into for-linus (diff)
parentHID: logitech: read all 32 bits of report type bitfield (diff)
parentHID: wacom: fix build breakage without CONFIG_LEDS_CLASS (diff)
parentHID: waltop: Extend barrel button fix (diff)
downloadlinux-99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc.tar.xz
linux-99ce58ddc4eadec8c35d9a1d64ff57703fdcfacc.zip
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
Conflicts: drivers/hid/hid-core.c