tree 2132e5dcee9e5ef9693742100953063cd6423b3a
parent 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4
parent 7b6cd95bb6c41653aed78952da0a461bd4791413
author Dave Airlie <airlied@linux.ie> 1162760598 +1100
committer Dave Airlie <airlied@linux.ie> 1162760598 +1100

Merge branch 'master' into nouveau-1

Conflicts:

	linux-core/Makefile.kernel