Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Mon, 30 Apr 2012 11:03:53 +0000 (13:03 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 30 Apr 2012 11:03:53 +0000 (13:03 +0200)
commit26c4ae0f0a0dd0d6c92909fa448fe8afd0302423
tree25cc8cda1e4d032477a3420c9b771479ee601d39
parent23749eba72cafbf84a0b600e7ce20f7cefd7d9a1
parent2034b94aa8e9e7fc266b25107f5fb9897addb151
Merge branch 'master-vanilla-configs' into linux-next

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