diff options
| author | Nicolas Thill <nico@openwrt.org> | 2015-04-02 14:53:19 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2015-04-02 14:53:19 +0000 |
| commit | 13338c42ad55e0153d02a8543a2efe440375ef71 (patch) | |
| tree | 6c9b3fda43640a7cfc6750e1cd0d1168f92ff17a /package/kernel/linux/modules/w1.mk | |
| parent | 0992961460e5d4310aa80474b5ae3b50b599144f (diff) | |
| download | upstream-13338c42ad55e0153d02a8543a2efe440375ef71.tar.gz upstream-13338c42ad55e0153d02a8543a2efe440375ef71.tar.bz2 upstream-13338c42ad55e0153d02a8543a2efe440375ef71.zip | |
kernel/modules: remove merge conflicts leftovers
Signed-off-by: Nicolas Thill <nico@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45243 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/linux/modules/w1.mk')
0 files changed, 0 insertions, 0 deletions