Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Mon, 5 Mar 2012 12:19:25 +0000 (13:19 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 5 Mar 2012 12:19:25 +0000 (13:19 +0100)
commit06aa30ef404983f9946d211b57641ff358496938
treefb4d0a278de84b32b46317966de4564c2272df1b
parent11c8e6e0c1ed5991acdcdd619cbbc9f53e95d305
parent01d45cdd00ada2c91054a1e4ed2acabb01ccc7b3
Merge branch 'master-vanilla-configs' into linux-next

Conflicts:
config/x86_64/vanilla
config/i386/vanilla
config/x86_64/vanilla