Merge branch 'dev' into kernel
authorVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 12:29:04 +0000 (16:29 +0400)
committerVyacheslav Cherkashin <v.cherkashin@samsung.com>
Tue, 30 Apr 2013 12:29:04 +0000 (16:29 +0400)
commitc36aff04385ad92cd0da8b62b5aea191e97d0a70
tree36660bf005821c50277d792978fb716f5233dfc5
parentba85708b73aa2dd2d051348d6135718b2b32ace2
parent28c75adf1839a860d9a39107579308791038f34f
Merge branch 'dev' into kernel

Conflicts:
src/modules/driver/us_proc_inst.c
driver/us_proc_inst.c
kprobe/dbi_kprobes_deps.c