From: Linus Torvalds Date: Tue, 11 Mar 2008 01:04:00 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 X-Git-Tag: v2.6.25-rc6~48 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: drivers: fix dma_get_required_mask firmware: provide stubs for the FW_LOADER=n case nozomi: fix initialization and early flow control access sysdev: fix problem with sysdev_class being re-registered --- ee215ca3b21dd73bec95dcaaa8c89e64cff6cbf8