Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb

int unregister_con_driver(const struct consw *csw);

int take_over_console(const struct consw *sw, int first, int last, int deflt);

void give_up_console(const struct consw *sw);

#ifdef CONFIG_HW_CONSOLE

int con_debug_enter(struct vc_data *vc);

int con_debug_leave(void);

#else

#define con_debug_enter(vc) (0)

#define con_debug_leave() (0)

#endif

/* scroll */

#define SM_UP       (1)