diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-26 10:03:03 (GMT) |
| commit | 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e (patch) | |
| tree | 9257bdba52ce88ca0a0c2f6fce1f59a1eb278452 /net | |
| parent | 16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff) | |
| parent | 5898eb79fb45d4fd4ce22139c168de937bfaab38 (diff) | |
| download | linux-fsl-qoriq-938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e.tar.xz | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Conflicts:
arch/arm/mach-pxa/tosa.c
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions