Dave Airlie b26c949755 fb: fix colliding defines for fb flags. ... When I added the flags I must have been using a 25 line terminal and missed the following flags. The collided with flag has one user in staging despite being in-tree for 5 years. I'm happy to push this via my drm tree unless someone really wants to do it. Signed-off-by: Dave Airlie <airlied@redhat.com> Cc: stable@kernel.org		2010-07-01 11:59:34 +10: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
drm	drm/radeon/kms/evergreen: set accel_enabled	2010-06-08 09:34:42 +10:00
keys
linux	fb: fix colliding defines for fb flags.	2010-07-01 11:59:34 +10: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: implement sd_unlock_native_capacity()	2010-06-02 13:50:04 -04:00
sound
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