Merge branch 'next'
authorPeter Korsgaard <jacmet@sunsite.dk>
Thu, 31 May 2012 07:23:23 +0000 (09:23 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Thu, 31 May 2012 07:23:23 +0000 (09:23 +0200)
commitbdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2
treed6012109e704c5e9abc709c23a7133a3d4b4f779
parent5b11223fb6cd0469becf49b0986868832c076bfc
parent2105ecbd86d04e446effa11108f6bd755ed5f19a
Merge branch 'next'

Conflicts:
toolchain/kernel-headers/Config.in
package/mtd/mtd.mk
toolchain/kernel-headers/Config.in