| commit | d733ed6c34be3aef0517a04e4103eed6b369ec50 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 16 10:33:41 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Apr 16 10:33:41 2011 -0700 |
| tree | b49723304c48c2f877b9cb284a4b39361934c670 | |
| parent | 08150c533c57981054324b9e87dbf686006d890f [diff] | |
| parent | 49cac01e1fa74174d72adb0e872504a7fefd7c01 [diff] |
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