summaryrefslogtreecommitdiff
path: root/drivers/i2c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-16 21:33:41 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-16 21:33:41 +0400
commitd733ed6c34be3aef0517a04e4103eed6b369ec50 (patch)
treeb49723304c48c2f877b9cb284a4b39361934c670 /drivers/i2c
parent08150c533c57981054324b9e87dbf686006d890f (diff)
parent49cac01e1fa74174d72adb0e872504a7fefd7c01 (diff)
downloadlinux-d733ed6c34be3aef0517a04e4103eed6b369ec50.tar.xz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: make unplug timer trace event correspond to the schedule() unplug block: let io_schedule() flush the plug inline
Diffstat (limited to 'drivers/i2c')
0 files changed, 0 insertions, 0 deletions