Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Sep 2010 18:06:34 +0000 (11:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 19 Sep 2010 18:06:34 +0000 (11:06 -0700)
commit81cef8e38babd1dd07eb53fccc956620a1b4f32e
treea012ad63404b652379b8a0bed80825266a94eaad
parent7d7dee96e1a7369eae67e5fe5c987785a1c11e40
parentdbee032295dac88742734ee9988e08a0e4f2f732
Merge git://git./linux/kernel/git/davem/ide-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
  ide: Fix ordering of procfs registry.