Merge branch 'for-upstream' into mini2440-stable
commit19deb80a31f388b3886cb011500e8868e2e31f62
authorMichel Pollet <buserror@gmail.com>
Tue, 2 Feb 2010 13:29:00 +0000 (2 13:29 +0000)
committerMichel Pollet <buserror@gmail.com>
Tue, 2 Feb 2010 13:29:00 +0000 (2 13:29 +0000)
treeca65557c36a75aef3ae551f43173260c5cf88653
parenta646269c2ada7691d8a7f7455ba4528c7cca3483
parent0609a25a5dbb57d1e7cb63509e25e74ce7dae35a
Merge branch 'for-upstream' into mini2440-stable