summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-05-14 22:50:39 +0200
committerMichal Marek <mmarek@suse.cz>2014-05-14 22:50:39 +0200
commit5366c855e0d8646bcdb5a6e5286cbf300688859f (patch)
treed80efdec5b905464608e612a0b3212d7f2f5fd73 /firmware
parent4fc90e122992b030b7ffe69161aa89d8630b8e75 (diff)
parent79c704a87834164259b7aa7469d426d6ba351eec (diff)
parent9da0763bdd82572be243fcf5161734f11568960f (diff)
Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next