Merge branch 'wl12xx-next'
authorLuciano Coelho <luciano.coelho@nokia.com>
Wed, 15 Dec 2010 13:42:52 +0000 (15:42 +0200)
committerLuciano Coelho <luciano.coelho@nokia.com>
Wed, 15 Dec 2010 13:42:52 +0000 (15:42 +0200)
commit09685cb047ac2d1683e11e3e099e634d98ebfd16
tree85a4b0430777078f3dc5747d547c9b4b6fec3468
parent601b5b75e75b2e6d07b7e555460f7bf71c1280a7
parent6742f554db14da94172da9eb1875a1aa944a827f
Merge branch 'wl12xx-next'