John W. Linville
|
515db09338
|
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h
|
2011-11-22 14:05:46 -05:00 |
|
Stanislaw Gruszka
|
1722f8e12a
|
iwlegacy: checkpatch.pl fixes
Fix most checkpatch.pl ERRORs and some WARNINGs.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
2011-11-15 14:51:01 +01:00 |
|
Stanislaw Gruszka
|
e7392364fc
|
iwlegacy: indentions and whitespaces
Process iwlegacy source files using:
indent -npro -l500 -nhnl
indent -npro -kr -i8 -ts8 -sob -l80 -nbbo -ss -ncs -cp1 -il0 -psl
Plus manual compilation fixes.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
2011-11-15 14:45:59 +01:00 |
|
Stanislaw Gruszka
|
f02579e3a8
|
iwlegacy: merge iwl-debug.h into common.h
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
2011-11-15 14:25:21 +01:00 |
|
Stanislaw Gruszka
|
f19ab370a7
|
iwlegacy: rename iwl-debug.c to debug.c
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
2011-11-15 14:24:36 +01:00 |