Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Wed, 21 Mar 2012 15:54:25 +0000 (16:54 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 21 Mar 2012 15:54:25 +0000 (16:54 +0100)
commit8214cfecf9aed13c173e367c4458739cde131e43
tree99782e25ca83e7c7a8e7e219b1d2ffa572a87c3c
parent50228e78a072a9c8147f63895eee8b58061decdb
parent1feb084b55aa0f932a459206ddb2bce85c0b5e6d
Merge branch 'master-vanilla-configs' into linux-next

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