Peter Korsgaard b108fdcb83 Merge branch 'next' ...

Conflicts:
	Makefile
	package/dmraid/Config.in
	package/gdb/Config.in.host
	package/linux-headers/linux-headers.mk
	package/python/python.mk
	package/python3/python3.mk
	package/rt-tests/Config.in
	package/sdl/sdl.mk
	package/systemd/systemd-01-fix-getty-unit.patch
	package/systemd/systemd-02-fix-page-size.patch
	package/systemd/systemd-03-uclibc-fix.patch
	package/udev/Config.in
	package/udisks/Config.in
	package/vlc/vlc.mk
	system/Config.in

Quite some merge conflicts, hopefully I didn't screw up anything.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

2014-02-28 14:30:23 +01:00

..

Config.in

gpsd: disallow NMEA2000 CAN driver on AVR32

2014-02-21 12:43:52 +01:00

gpsd-02-sconstruct-disable-rpath.patch

gpsd: bump git snapshot

2014-01-04 21:06:01 +01:00

gpsd.mk

udev: convert to virtual package

2014-02-12 22:14:19 +01:00

S50gpsd

Remove stray $ character from a bunch of init scripts

2012-03-15 22:11:25 +01:00