diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 15:26:27 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-22 15:26:27 (GMT) |
| commit | ddfb43f3881edb47aa0083651ad31983cdc42c33 (patch) | |
| tree | 7128cb13b599d2903a4deb05bbae37508b1c261e /net/9p | |
| parent | 2d6d649a2e0fa0268c0d03d5b1d330ca7907d33c (diff) | |
| parent | 5698bd757d55b1bb87edd1a9744ab09c142abfc2 (diff) | |
| download | linux-fsl-qoriq-ddfb43f3881edb47aa0083651ad31983cdc42c33.tar.xz | |
Merge tag 'v3.6-rc6' into for-3.7
Linux 3.6-rc6 has all our bug fixes.
Conflicts (trivial overlap):
sound/soc/omap/am3517evm.c
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions