summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:35 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-03 21:11:35 +0200
commitd8b30e6c3823bfe50c3e060aab39b0fab2de933f (patch)
treea08ff0d2f8282854a8b1177f04e89cee57d65258 /.gitignore
parenta3cd9a7ebe2c21bd96542c0f840eb92208f7cec6 (diff)
parent65708cdb047363084b5b1a70b168043c6bc28bad (diff)
downloadbarebox-d8b30e6c3823bfe50c3e060aab39b0fab2de933f.tar.gz
Merge branch 'for-next/mxs'
Conflicts: arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions