Skip to content
Commit 47c94142 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git 

# Conflicts:
#	drivers/char/pcmcia/cm4000_cs.c
#	drivers/char/pcmcia/cm4040_cs.c
#	drivers/char/pcmcia/scr24x_cs.c
#	drivers/char/pcmcia/synclink_cs.c
parents 687fd59c 1fb1ea0d
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment