diff options
| author | Tony Lindgren <[email protected]> | 2010-03-01 22:19:05 +0000 |
|---|---|---|
| committer | Tony Lindgren <[email protected]> | 2010-03-01 22:19:05 +0000 |
| commit | d702d12167a2c05a346f49aac7a311d597762495 (patch) | |
| tree | baae42c299cce34d6df24b5d01f8b1d0b481bd9a /net/lapb/lapb_subr.c | |
| parent | omap2: Initialize Menelaus and MMC for N8X0 (diff) | |
| parent | Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | kernel-d702d12167a2c05a346f49aac7a311d597762495.tar.gz kernel-d702d12167a2c05a346f49aac7a311d597762495.zip | |
Merge with mainline to remove plat-omap/Kconfig conflict
Conflicts:
arch/arm/plat-omap/Kconfig
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions