David Vrabel b21a207141 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream ...

Conflicts:

	drivers/uwb/wlp/eda.c

2009-01-02 13:17:13 +00:00

..

i1480

uwb: remove unused include/linux/uwb/debug.h

2008-12-22 18:30:29 +00:00

wlp

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream

2009-01-02 13:17:13 +00:00

address.c

uwb: remove unused include/linux/uwb/debug.h

2008-12-22 18:30:29 +00:00

allocator.c

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

beacon.c

uwb: remove beacon cache entry after calling uwb_notify()

2008-12-23 12:31:09 +00:00

driver.c

uwb: remove unused include/linux/uwb/debug.h

2008-12-22 18:30:29 +00:00

drp-avail.c

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

drp-ie.c

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

drp.c

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

est.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

hwa-rc.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

ie-rcv.c

uwb: infrastructure for handling Relinquish Request IEs

2008-11-04 15:53:29 +00:00

ie.c

uwb: order IEs by element ID

2008-10-28 12:09:17 +00:00

Kconfig

uwb: depend on EXPERIMENTAL

2008-09-17 16:54:36 +01:00

lc-dev.c

uwb: remove beacon cache entry after calling uwb_notify()

2008-12-23 12:31:09 +00:00

lc-rc.c

uwb: add basic radio manager

2008-11-19 14:46:33 +00:00

Makefile

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

neh.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

pal.c

wusb: add debug files for ASL, PZL and DI to the whci-hcd driver

2008-11-26 13:36:59 +00:00

radio.c

uwb: add basic radio manager

2008-11-19 14:46:33 +00:00

reset.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

rsv.c

uwb: fix oops when terminating an already terminated reservation

2008-12-12 13:23:24 +00:00

scan.c

uwb: add the UWB stack (MLME)

2008-09-17 16:54:24 +01:00

umc-bus.c

uwb: don't unbind the radio controller driver when resetting

2008-11-07 17:37:33 +00:00

umc-dev.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

umc-drv.c

uwb: add the umc bus

2008-09-17 16:54:25 +01:00

uwb-debug.c

uwb: use print_hex_dump()

2008-12-22 18:27:17 +00:00

uwb-internal.h

uwb: improved MAS allocator and reservation conflict handling

2008-12-12 13:00:06 +00:00

uwbd.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

whc-rc.c

uwb: use dev_dbg() for debug messages

2008-12-22 18:22:50 +00:00

whci.c

uwb: clean up whci_wait_for() timeout error message

2008-11-25 14:34:47 +00:00