On Thu, Aug 14, 2014 at 05:53:10PM -0700, Aaron Brice wrote: > Bring braces in line with CodingStyle > > Signed-off-by: Aaron Brice <aaron@xxxxxxxxxxxxxxx> > --- > Applies to next-20140814 > > drivers/staging/dgnc/dgnc_neo.c | 10 ++++------ > drivers/staging/dgnc/dgnc_sysfs.c | 6 ++---- > drivers/staging/dgnc/dgnc_tty.c | 38 +++++++++++--------------------------- > 3 files changed, 17 insertions(+), 37 deletions(-) This conflicts with some patches that others have sent before you, so it will not end up applying to my tree properly :( Can you wait until after 3.17-rc1 is out and I can push out the updated staging tree patches and resync after that? Should happen by next Tuesday or so. thanks, greg k-h _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel