The following is a series of six patches to bring the linux-mips tree in sync with Linus' tree. These are changes that have to be made on the linux-mips side. Another series will be posted for inclusion in -mm to bring the Linus' tree in sync with linux-mips where necessary. [PATCH 1/6] [CHAR] Remove obsolete IBM z50 (vr41xx) keyboard map [PATCH 2/6] [VIDEO] Remove trailing whitespace from drivers/video/Kconfig [PATCH 3/6] Remove bogus blank lines - sync with Linus' tree [PATCH 4/6] [NET] Fix NET_SB1250_MAC Kconfig order to match Linus' tree [PATCH 5/6] [MIPS] vr41xx: remove timex.h [PATCH 6/6] [MTD] Remove typecast from drivers/mtd/maps/lasat.c -- Martin Michlmayr http://www.cyrius.com/