Jiri Kosina 6396fc3b3f Merge branch 'master' into for-next ...

Conflicts:
	fs/exofs/inode.c

2010-08-11 09:36:51 +02:00

..

drm

Merge branch 'master' into for-next

2010-08-11 09:36:51 +02:00

vga

vgaarb: use MIT license

2010-06-03 13:13:34 +10:00

Makefile

PCI/GPU: implement VGA arbitration on Linux

2009-09-09 13:29:36 -07:00