commit | 8fade6aff706b2ae3f02864b4023d34b002cd226 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 10 10:26:42 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 10 10:26:42 2010 -0700 |
tree | c2c68afd662d5fbaef042e56d91d7813d3a5a9e6 | |
parent | e1f38e2cea199ef2b8e117506fef8abbecbaae5e [diff] | |
parent | 6db40cf047a8723095caf79f5569d21b388d7b31 [diff] |
Merge branch 'for-linus2' of git://git.kernel.dk/linux-2.6-block * 'for-linus2' of git://git.kernel.dk/linux-2.6-block: pipe: fix check in "set size" fcntl pipe: fix pipe buffer resizing block: remove duplicate BUG_ON() in bd_finish_claiming() block: bd_start_claiming cleanup block: bd_start_claiming fix module refcount