Merge branch 'devel'
commit5167af76ad6429b06b139655aba8e0c5a765d18f
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 17 Oct 2014 07:09:36 +0000 (17 10:09 +0300)
committerDan Carpenter <dan.carpenter@oracle.com>
Fri, 17 Oct 2014 07:09:36 +0000 (17 10:09 +0300)
treef34ca934ca8aa6e5f37bf308e85f4b1295f5ceeb
parent73d00541f2810ae8950c3216ac4ccfe6155f7eb8
parent5f6e1748a878dac62adde2355886b372cf2c9f67
Merge branch 'devel'