Merge branch 'master' into nouveau-1
authorDave Airlie <airlied@linux.ie>
Sun, 5 Nov 2006 21:03:18 +0000 (08:03 +1100)
committerDave Airlie <airlied@linux.ie>
Sun, 5 Nov 2006 21:03:18 +0000 (08:03 +1100)
commit1e90b7ee8cefff59b70e285557aa7920dea77e81
tree2132e5dcee9e5ef9693742100953063cd6423b3a
parent0c34d0f31a691bb649ed69f19e93fc1a723aa1d4
parent7b6cd95bb6c41653aed78952da0a461bd4791413
Merge branch 'master' into nouveau-1

Conflicts:

linux-core/Makefile.kernel
linux-core/Makefile.kernel