[Commit-gnuradio] git://gnuradio.org/gnuradio branch, master, updated. 3.6.0git-22-g847be64

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/gnuradio".

The branch, master has been updated
       via  847be64ac11f767a9ef631154ef88030e9d4d8ba (commit)
       via  92db96430685e843443a00936328b3539354c83e (commit)
       via  c3f2c30a54c75575f464afdd7cd11a017fb07695 (commit)
      from  ec7faa9b80dff18ef170d85efdd498bea3af4940 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 847be64ac11f767a9ef631154ef88030e9d4d8ba
Merge: ec7faa9 92db964
Author: Johnathan Corgan <address@hidden>
Date:   Mon Apr 16 08:39:32 2012 -0700

    Merge branch 'maint'
    
    Conflicts:
        volk/gen/make_cpuid_c.py

-----------------------------------------------------------------------

Summary of changes:
 volk/gen/archs.xml       |    2 ++
 volk/gen/make_cpuid_c.py |   45 ++++++++++++++++++++++++++++++++++-----------
 volk/lib/gcc_x86_cpuid.h |   12 ++++++++++++
 3 files changed, 48 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
git://gnuradio.org/gnuradio