From: Jiri Kosina Date: Mon, 27 Aug 2012 15:04:24 +0000 (-0700) Subject: Merge branch 'master' into upstream X-Git-Tag: next-20120904~81^2~3^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e;p=karo-tx-linux.git Merge branch 'master' into upstream Sync with Linus' tree so that we don't have build falures due to Quanta 3001 ID reshuffling. --- 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e