Nicolas Thill 3bd422f610 kernel/modules: remove merge conflicts leftovers ... Signed-off-by: Nicolas Thill <nico@openwrt.org> SVN-Revision: 45243		2015-04-02 14:53:19 +00:00
..
base-files	base-files: add a init.d option that will start the syscall tracer	2015-03-26 10:58:17 +00:00
boot	packages: uboot-mxs: bump to 2015.01	2015-03-26 22:39:06 +00:00
devel	build: remove obsolete references to cris and avr32	2015-03-24 10:07:40 +00:00
firmware	kernel: add staging r8188eu module (3.13)	2014-04-30 21:53:29 +00:00
kernel	kernel/modules: remove merge conflicts leftovers	2015-04-02 14:53:19 +00:00
libs	ustream-ssl: fix SNI when building against cyassl	2015-04-01 15:11:38 +00:00
network	mdns: add conffiles section	2015-04-02 14:53:07 +00:00
system	uci: update to the latest version, fixes delta path / savedir issues	2015-03-31 16:44:32 +00:00
utils	e2fsprogs: add conffiles section	2015-04-02 14:53:12 +00:00
Makefile	postinst trigger: the new postinst trigger broke IB	2014-09-16 11:56:19 +00:00