Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 6 insertions, 1 deletions

diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py
index e24ffadb20b..bbc982f5dd8 100644
--- a/tools/perf/util/setup.py
+++ b/tools/perf/util/setup.py
@@ -1,13 +1,18 @@
 #!/usr/bin/python2
 
 from distutils.core import setup, Extension
+from os import getenv
+
+cflags = ['-fno-strict-aliasing', '-Wno-write-strings']
+cflags += getenv('CFLAGS', '').split()
 
 perf = Extension('perf',
                   sources = ['util/python.c', 'util/ctype.c', 'util/evlist.c',
                              'util/evsel.c', 'util/cpumap.c', 'util/thread_map.c',
                              'util/util.c', 'util/xyarray.c', 'util/cgroup.c'],
                   include_dirs = ['util/include'],
-                  extra_compile_args = ['-fno-strict-aliasing', '-Wno-write-strings'])
+                  extra_compile_args = cflags,
+                 )
 
 setup(name='perf',
       version='0.1',