diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-11 17:50:05 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-11 17:50:05 +0400 |
commit | 53f1d9afb4c85c4d6a107420188d84ddf76ebbc0 (patch) | |
tree | 5e4ddea79c08a2e0424c9d64c4b1e08decbf0442 /drivers/net/irda/Kconfig | |
parent | bce5669be3a8946952258a064ef26defeb887138 (diff) | |
parent | c9d347e0277696c80496161cbef47393b850a0aa (diff) | |
parent | b5b6b5f5442860474ebd263cfd3e4a2a972632d8 (diff) | |
download | linux-53f1d9afb4c85c4d6a107420188d84ddf76ebbc0.tar.xz |
Merge branches 'fixes' and 'misc' into for-next