diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 15:06:59 -0800 |
| commit | 8f9993f76aacfc58083fad04f8e1b6bbea33de23 (patch) | |
| tree | 90d7885b26b87d27ed4cdb4026e608908e8a8a4c /net/lapb/lapb_subr.c | |
| parent | Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff) | |
| parent | ARM: at91: code removal of CAP9 SoC (diff) | |
| download | linux-dev-8f9993f76aacfc58083fad04f8e1b6bbea33de23.tar.xz linux-dev-8f9993f76aacfc58083fad04f8e1b6bbea33de23.zip | |
Merge branch 'at91-3.4-base' of git://github.com/at91linux/linux-at91 into next/cleanup
* 'at91-3.4-base' of git://github.com/at91linux/linux-at91:
ARM: at91: code removal of CAP9 SoC
Conflicts:
arch/arm/mach-at91/at91cap9.c
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions