Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Tue, 11 Sep 2012 07:43:35 +0000 (09:43 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 11 Sep 2012 07:43:35 +0000 (09:43 +0200)
commit027b475b7bedf0618664a064e2bc9d1c8ec422d7
treee8ce86daffeb633f0e781845b602cb01c8f233b6
parent3c73744ed3e19ddcc0aa75c2c782acc382dc7fa3
parenta83424cb9911b5b7b76d8d7b98d4ebfc1143f62c
Merge branch 'master-vanilla-configs' into linux-next

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