commit | 1f04a73e2c6368bac8f9e0ac3ada58e6b41163f0 | [log] [tgz] |
---|---|---|
author | Brian Norris <computersforpeace@gmail.com> | Wed Oct 29 18:56:26 2014 -0700 |
committer | Brian Norris <computersforpeace@gmail.com> | Wed Oct 29 18:56:26 2014 -0700 |
tree | 4577b37dcef4700db2cb3b1f0902f49d56c83239 | |
parent | 5935946c6a1180dcb495fffb2c45eddedfa09064 [diff] | |
parent | 89cf38dd536a7301d6b5f5ddd73f42074c01bfaa [diff] |
MTD: merge 3.18 development into -next development To keep the two paths in sync