Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 10:19:45 +0000 (12:19 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 10:19:45 +0000 (12:19 +0200)
commitaf2a3b2c0c97dcfbbb4a0036177618143ca4c7c8
tree80f4a5affe7ae758f5255bfac10772749eb0e1bb
parent38a93428529235326e8e35cdaaf86fcc3d7bc85f
parentca91ac59f3fc8f9ebdc56f4dccf4e5132b648294
Merge branch 'master-vanilla-configs' into linux-next

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