diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-06-18 14:03:21 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-06-18 14:03:21 -0700 |
| commit | 415bf34fc073d5f8e10dc65c5c8e8a448c984bc3 (patch) | |
| tree | df15ea9a1801ae063fbdb1d0dc494448c489b0ce | |
| parent | fb97a845ad2d8b634a5a2dfa2e4a925ffff9ba45 (diff) | |
| download | patches-415bf34fc073d5f8e10dc65c5c8e8a448c984bc3.tar.gz | |
version resyncv2.6.22-rc5
| -rw-r--r-- | driver/block-device.patch | 4 | ||||
| -rw-r--r-- | pci/pci-remove-cpqphp-maintainer.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch index 87ea644c6def6..9abb634fd101f 100644 --- a/driver/block-device.patch +++ b/driver/block-device.patch @@ -745,7 +745,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> EXPORT_SYMBOL(put_disk); --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c -@@ -4076,7 +4076,7 @@ int blk_register_queue(struct gendisk *d +@@ -4085,7 +4085,7 @@ int blk_register_queue(struct gendisk *d if (!q || !q->request_fn) return -ENXIO; @@ -754,7 +754,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ret = kobject_add(&q->kobj); if (ret < 0) -@@ -4103,6 +4103,6 @@ void blk_unregister_queue(struct gendisk +@@ -4112,6 +4112,6 @@ void blk_unregister_queue(struct gendisk kobject_uevent(&q->kobj, KOBJ_REMOVE); kobject_del(&q->kobj); diff --git a/pci/pci-remove-cpqphp-maintainer.patch b/pci/pci-remove-cpqphp-maintainer.patch index 2b43c652c3e22..dbad116ad89e0 100644 --- a/pci/pci-remove-cpqphp-maintainer.patch +++ b/pci/pci-remove-cpqphp-maintainer.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2804,11 +2804,6 @@ P: Kristen Carlson Accardi +@@ -2814,11 +2814,6 @@ P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com S: Supported @@ -1 +1 @@ -2.6.22-rc4-git7 +2.6.22-rc5 |