From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 15 Apr 2006 00:08:18 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.17-rc2~32
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcdc084257352902103aca85c65ddbbba8f74732;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6: (169 commits)
  commit 78a596b4490e17b9990d87b9d468ef5bb70daa10
  Author: Adrian Bunk <bunk@stusta.de>
  Date:   Fri Mar 31 01:38:12 2006 -0800

      [PATCH] remove kernel/power/pm.c:pm_unregister()

      Since the last user is removed in -mm, we can now remove this long deprecated
      function.

      Signed-off-by: Adrian Bunk <bunk@stusta.de>
      Cc: Pavel Machek <pavel@ucw.cz>
      Signed-off-by: Andrew Morton <akpm@osdl.org>
      Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

  commit 21440d313358043b0ce5e43b00ff3c9b35a8616c
  Author: David Brownell <david-b@pacbell.net>
  Date:   Sat Apr 1 10:21:52 2006 -0800

      [PATCH] dma doc updates

  ...
---

bcdc084257352902103aca85c65ddbbba8f74732