diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 19:41:56 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 19:41:56 (GMT) |
| commit | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (patch) | |
| tree | 12d57a8403b3dc7aca72a13896c3e73aca98a4a9 /drivers/w1 | |
| parent | abbb0db2bd9d0bbfad3219604045168c50180539 (diff) | |
| parent | 878040ef831a12855af26a42cc25c817f4fb3f2d (diff) | |
| download | linux-fsl-qoriq-25e4b485fb8eeda8aa7a2e1e45fbb31538565117.tar.xz | |
Merge branch 'bcmring/cleanup' into bcmring/removal
Doing a large-scale cleaning and removing the platform in another
branch don't mix well, so do the trivial merge here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions