diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-05-22 19:53:47 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-05-22 19:53:47 +0200 |
| commit | 9143c0988f1d49f682a5c70d4318c6cc3000530d (patch) | |
| tree | 9ba8a070617f37ec7b5563594663c81dc2856917 | |
| parent | 0f1bfa08ced1bd3482220bf3b97bb55fcc45de31 (diff) | |
| parent | 9dc71d0fb715c4732831606f50b1efed24d63276 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch | 3 | ||||
| -rw-r--r-- | recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch index 1b208f7979..3d84a4c20c 100644 --- a/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.33/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 +++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 @@ -60,6 +60,8 @@ diff --git a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch index 8fe37de9d3..f3a417dbc7 100644 --- a/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch +++ b/recipes/bluez/bluez-utils-3.x/hciattach-ti-bts.patch @@ -1,3 +1,6 @@ +upstream: accepted, this patch has landed upstream albeit in a different form +sometime between 3.35 and 3.36. see the commit message in "git log e1d12d8bb5b40a6313cce52974f174fd76cbf32c" + --- bluez-utils-2.24/tools/hciattach.c.orig 2005-12-10 15:14:36.000000000 +0100 +++ bluez-utils-2.24/tools/hciattach.c 2006-01-22 13:56:13.000000000 +0100 @@ -57,6 +57,8 @@ |