03054de1e0b90b33e9974107d84dabd2509f5898 - kernel/msm

commit	03054de1e0b90b33e9974107d84dabd2509f5898	[log] [tgz]
author	Linus Torvalds <torvalds@woody.linux-foundation.org>	Fri Feb 08 09:42:46 2008 -0800
committer	Linus Torvalds <torvalds@woody.linux-foundation.org>	Fri Feb 08 09:42:46 2008 -0800
tree	a85e92d5387d94ef9e3d10bf11467136c681ad04
parent	b5eb9513f7c1bee862ada22bf1489f53752686bd [diff]
parent	0e53c2be0495afa97c6b0d06397adcbff9c65347 [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:
  Enhanced partition statistics: documentation update
  Enhanced partition statistics: remove old partition statistics
  Enhanced partition statistics: procfs
  Enhanced partition statistics: sysfs
  Enhanced partition statistics: aoe fix
  Enhanced partition statistics: update partition statitics
  Enhanced partition statistics: core statistics
  block: fixup rq_init() a bit

Manually fixed conflict in drivers/block/aoe/aoecmd.c due to statistics
support.

tree: a85e92d5387d94ef9e3d10bf11467136c681ad04