diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:51:00 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 22:51:00 +0000 |
| commit | 0782e5bb57e16428de32f0f933c77324b186193f (patch) | |
| tree | dc7770ce6bc2dbf703799ba1aecae9b2085020da /crypto/api.c | |
| parent | Merge branch 'omap/soc' into next/soc (diff) | |
| parent | ARM: kexec: use soft_restart for branching to the reboot buffer (diff) | |
| parent | Merge branch 'for-3.3/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into tegra/dt (diff) | |
| download | wireguard-linux-0782e5bb57e16428de32f0f933c77324b186193f.tar.xz wireguard-linux-0782e5bb57e16428de32f0f933c77324b186193f.zip | |
Merge branches 'depends/rmk/devel-stable' and 'tegra/dt' into next/soc
Dependencies for tegra/soc branch
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>