Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:57:03 +0000 (13:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Nov 2009 21:57:03 +0000 (13:57 -0800)
commitb54eb1795c0cfeb6cc48fdcbd010e800541750ad
tree85ac272cfee48497ecaaf121b74db5a6bd021cf3
parent0bb324626575e89385ca384d8cdd98fbeaeb0545
parent69ac74822277fa999a3f469d8362e93262deb3f4
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  cciss: make device attrs static
  Thaw refrigerated bdi flusher threads before invoking kthread_stop on them