From: Linus Torvalds Date: Fri, 24 Apr 2009 15:16:05 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 X-Git-Tag: firefly_0821_release~14351 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d1f53fb90ee631a2cf8f7bdd0e921a338106e4f9;p=firefly-linux-kernel-4.4.55.git Merge branch 'for-linus' of git://git./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 --- d1f53fb90ee631a2cf8f7bdd0e921a338106e4f9