diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /net/bluetooth/lib.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'net/bluetooth/lib.c')
| -rw-r--r-- | net/bluetooth/lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c index ad2af5814e40..b826d1bf10df 100644 --- a/net/bluetooth/lib.c +++ b/net/bluetooth/lib.c | |||
| @@ -51,8 +51,8 @@ char *batostr(bdaddr_t *ba) | |||
| 51 | 51 | ||
| 52 | i ^= 1; | 52 | i ^= 1; |
| 53 | sprintf(str[i], "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X", | 53 | sprintf(str[i], "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X", |
| 54 | ba->b[0], ba->b[1], ba->b[2], | 54 | ba->b[5], ba->b[4], ba->b[3], |
| 55 | ba->b[3], ba->b[4], ba->b[5]); | 55 | ba->b[2], ba->b[1], ba->b[0]); |
| 56 | 56 | ||
| 57 | return str[i]; | 57 | return str[i]; |
| 58 | } | 58 | } |