diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-26 11:05:04 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-26 11:05:04 -0800 |
| commit | 65f9c1312c23e5646414659797b8790d779a2445 (patch) | |
| tree | 2677d7ed61125d8d59d6ee8a0c6763078eeb776b /net/unix/af_unix.c | |
| parent | a80ffa191b093129e184c7e06ef718a3937f2075 (diff) | |
| parent | 0d8c67218cef8af259e4d12221434a1d7b0f3bbc (diff) | |
Merge tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/boards
From Stephen Warren:
ARM: tegra: defconfig changes
Enable new features required by the Venice2 board.
This branch is based on v3.13-rc1, and shouldn't cause any conflicts.
* tag 'tegra-for-3.14-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: tegra_defconfig updates
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions