James Bottomley df64d3caab [SCSI] Unify SAM_ and SAM_STAT_ macros ... We have two separate definitions for identical constants with nearly the same name. One comes from the generic headers in scsi.h; the other is an enum in libsas.h ... it's causing confusion about which one is correct (fortunately they both are). Fix this by eliminating the libsas.h duplicate Signed-off-by: James Bottomley <James.Bottomley@suse.de>		2010-07-28 09:07:49 -05:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-05-28 14:42:18 -07:00
asm-generic	Merge branch 'for-35' of git://repo.or.cz/linux-kbuild	2010-06-01 08:55:52 -07:00
crypto	crypto: skcipher - Add ablkcipher_walk interfaces	2010-05-19 14:13:07 +10:00
drm	drm/radeon/kms/evergreen: set accel_enabled	2010-06-08 09:34:42 +10:00
keys
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2010-06-11 14:20:03 -07:00
math-emu
media	V4L/DVB: saa7134: add RM-K6 remote control support for Avermedia M135A	2010-06-01 01:22:09 -03:00
mtd
net	net: check for refcount if pop a stacked dst_entry	2010-06-04 15:56:00 -07:00
pcmcia
rdma	IB/core: Allow device-specific per-port sysfs files	2010-05-21 10:34:44 -07:00
rxrpc
scsi	[SCSI] Unify SAM_ and SAM_STAT_ macros	2010-07-28 09:07:49 -05:00
sound	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6	2010-05-20 09:41:44 -07:00
trace	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-06-10 09:30:09 -07:00
video	fbdev: move FBIO_WAITFORVSYNC to linux/fb.h	2010-05-25 08:07:09 -07:00
xen
Kbuild