diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 09:34:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 09:34:47 +0000 |
| commit | 489e7bece7f6859a7df484a4dce08fa51fb0d876 (patch) | |
| tree | d930d7c3a69490a24916236feac68ad863c06702 /drivers/char/tpm/Kconfig | |
| parent | f82989bde1cfa5e2b4614d8e4896d795dae418d9 (diff) | |
| parent | 5353ec2cd13deb4f70aef1dcd296cadaac3f780b (diff) | |
| download | linux-3.10-489e7bece7f6859a7df484a4dce08fa51fb0d876.tar.gz linux-3.10-489e7bece7f6859a7df484a4dce08fa51fb0d876.tar.bz2 linux-3.10-489e7bece7f6859a7df484a4dce08fa51fb0d876.zip | |
Merge branch 'fixes' into next/fixes-non-critical
The one fix didn't make the cut for 3.3, so we're putting it
into v3.4. Tony tells me "There are more patches needed to make
multiple smsc91x instances work, but we need to hear from people
with such boards first. Then those can be tagged for stable.",
so we don't mark this patch stable yet.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/char/tpm/Kconfig')
0 files changed, 0 insertions, 0 deletions