tree 8e557460f0cf557d26d5f59991ebffc3402b10e9
parent aeb24d2fb08653a39abb50281b1ffa2d2a6879ab
parent e88a0c2ca81207a75afe5bbb8020541dabf606ac
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1205197440 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1205197440 -0700

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