Evolution-x-devices/kernel_google_b1c1
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_google_b1c1 synced 2026-02-09 00:55:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
3cfc348bf90ffaa777c188652aa297f04eb94de8
kernel_google_b1c1/include/linux/pci_ids.h
James Bottomley c9802cd957 Merge mulgrave-w:git/scsi-misc-2.6 
Conflicts:

	drivers/scsi/iscsi_tcp.c
	drivers/scsi/iscsi_tcp.h

Pretty horrible merge between crypto hash consolidation
and crypto_digest_...->crypto_hash_... conversion

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
2006-09-23 15:33:43 -05:00

88 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink