diff options
author | David S. Miller <davem@davemloft.net> | 2012-10-03 05:02:10 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-10-03 05:02:10 +0200 |
commit | 954f9ac43b87b44152b8c21163cefd466a87145e (patch) | |
tree | 31c4197f975c66c96976948663e6ce844900b41a /Kconfig | |
parent | sparc64: Fix return value of Niagara-2 memcpy. (diff) | |
parent | Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/... (diff) | |
download | linux-954f9ac43b87b44152b8c21163cefd466a87145e.tar.xz linux-954f9ac43b87b44152b8c21163cefd466a87145e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
There's a Niagara 2 memcpy fix in this tree and I have
a Kconfig fix from Dave Jones which requires the sparc-next
changes which went upstream yesterday.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Kconfig')
0 files changed, 0 insertions, 0 deletions