From: KH <karsten@dell.bitnap.de>
Date: Fri, 7 Nov 2008 16:52:50 +0000 (+0100)
Subject: Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5
X-Git-Tag: hwdata-0.213.12-1~3^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2bc0d8e784c10698ded8c084ab75ecec758d4811;p=oweals%2Fhwdata.git

Merge branch 'RHEL5' of ssh://git.fedoraproject.org/git/hosted/hwdata into RHEL5

Conflicts:

	hwdata.spec
	pci.ids
	usb.ids
---

2bc0d8e784c10698ded8c084ab75ecec758d4811
diff --cc usb.ids
index 93f5bcc,073ba88..0664e00
--- a/usb.ids
+++ b/usb.ids
@@@ -1,5 -1,5 +1,5 @@@
  #
--#	List of USB ID's
++#     List of USB ID's
  #
  #	Maintained by Stephen J. Gowdy <sgowdy+usb.ids@gmail.com>
  #	If you have any new entries, send them to the maintainer.