xf86-video-ati: Branch 'master' - 2 commits

[Dave Airlie]

 Makefile.am     |    2 +-
 src/Makefile.am |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 7ad11fec2579807371360cb680e593f723ebaa1a
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jul 6 18:43:08 2009 +1000

    radeon: add make dist headers

diff --git a/src/Makefile.am b/src/Makefile.am
index 421d163..57a365b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -169,4 +169,6 @@ EXTRA_DIST = \
 	radeon_pci_device_match_gen.h \
 	pcidb/ati_pciids.csv \
 	pcidb/parse_pci_ids.pl \
-	radeon_atombios.h
+	radeon_atombios.h \
+	radeon_dri2.h \
+	drmmode_display.h
commit e68fbf743ec88e0fa3a9f1ffe83daf251e250b21
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jul 6 18:32:32 2009 +1000

    git: fix git-log to git log

diff --git a/Makefile.am b/Makefile.am
index 87e90ba..242f5b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,6 @@ CLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 dist-hook: ChangeLog