commit d1f53fb90ee631a2cf8f7bdd0e921a338106e4f9
author Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 24 08:16:05 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Apr 24 08:16:05 2009 -0700
tree 94b0177d06d5c648808b0dec0241b33a51d3d27e
parent 90c8fce53a48dd22cf09c67c861e3aaad17026ed
parent b930f964cfe65941c6b1ba61efedfe49da3f6353

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
  MAINTAINERS: update IDE entry
  palm_bk3710: palm_bk3710_udmatimings[] CodingStyle fixup
  palm_bk3710: those registers/bitfields don't exist
  mediabay: fix build for CONFIG_BLOCK=n
  ide: Stop disks on reboot for laptop which cuts power
  ide-cd: fix kernel crash on hppa regression
  palm_bk3710: UDMA performance fix