Merge branch 'master' into gsoc2-audiobuf-accesses
commitd062ea497d94351b0ec5030df5ffef1217506507
authorThomas Martitz <kugel@rockbox.org>
Sun, 31 Jul 2011 11:43:34 +0000 (31 13:43 +0200)
committerThomas Martitz <kugel@rockbox.org>
Sun, 31 Jul 2011 11:43:34 +0000 (31 13:43 +0200)
tree0bc63dda2e64781d84e75698371a562b78c82594
parent495d0cef9b7ec8015796610d965f1a084ed12016
parent4a7b159bdd5c20266d3b6ca8caf70fd4a2d4dc1e
Merge branch 'master' into gsoc2-audiobuf-accesses
firmware/common/dircache.c