Greg Kroah-Hartman d210267741 Merge 3.4-rc5 into staging-next ... This resolves the conflict in: drivers/staging/vt6656/ioctl.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-05-02 11:48:07 -07:00
..
_cmm.h	staging: ti dspbridge: add core driver sources	2010-06-23 15:39:06 -07:00
_deh.h	staging: tidspbridge: set8 remove hungarian from structs	2011-02-04 20:12:22 -06:00
_msg_sm.h	staging: tidspbridge: set11 remove hungarian from structs	2011-02-04 20:12:28 -06:00
_tiomap.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
_tiomap_pwr.h	staging: tidspbridge: remove IN modifier	2010-07-22 14:41:04 -07:00
chnl_sm.c	staging: tidspbridge: remove dbc.h	2012-02-09 09:38:19 -08:00
dsp-clock.c	staging: tidspbridge: remove dbc.h	2012-02-09 09:38:19 -08:00
io_sm.c	staging: Fix typo in multiple files	2012-04-10 10:31:01 -07:00
msg_sm.c	staging: tidspbridge: remove dbc.h	2012-02-09 09:38:19 -08:00
sync.c	staging: tidspbridge: Remove ntfy.c	2010-08-31 11:23:14 -07:00
tiomap3430.c	staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS	2012-04-24 11:57:36 -07:00
tiomap3430_pwr.c	staging: tidspbridge: remove DBC_ASSERT macro	2012-02-09 09:38:19 -08:00
tiomap_io.c	staging: tidspbridge: remove dbc.h	2012-02-09 09:38:19 -08:00
tiomap_io.h	staging: tidspbridge: remove OUT define	2010-07-22 14:41:04 -07:00
ue_deh.c	staging: Fix typo in multiple files	2012-04-10 10:31:01 -07:00
wdt.c	staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS	2012-04-24 11:57:36 -07:00